From 85e4dccef23ac3c3cafdd271b9212b2db9788185 Mon Sep 17 00:00:00 2001 From: Yehuda Katz Date: Tue, 29 Apr 2014 11:05:01 -0700 Subject: [PATCH] Everything's compiling again --- libs/hammer.rs | 2 +- src/cargo/util/process_builder.rs | 10 +++++----- tests/support.rs | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/hammer.rs b/libs/hammer.rs index 7890ef0bd..0a256d6f0 160000 --- a/libs/hammer.rs +++ b/libs/hammer.rs @@ -1 +1 @@ -Subproject commit 7890ef0bd8a330971e1f1c0e912c35ecd2106078 +Subproject commit 0a256d6f033f8652d3fbd84a4d5ae85aff582f3b diff --git a/src/cargo/util/process_builder.rs b/src/cargo/util/process_builder.rs index 508065ab3..0f500c501 100644 --- a/src/cargo/util/process_builder.rs +++ b/src/cargo/util/process_builder.rs @@ -7,8 +7,8 @@ use CargoResult; #[deriving(Clone,Eq)] pub struct ProcessBuilder { program: ~str, - args: ~[~str], - path: ~[~str], + args: Vec<~str>, + path: Vec<~str>, cwd: Path } @@ -17,7 +17,7 @@ static PATH_SEP : &'static str = ":"; impl ProcessBuilder { pub fn args(mut self, arguments: &[~str]) -> ProcessBuilder { - self.args = arguments.to_owned(); + self.args = Vec::from_slice(arguments); self } @@ -56,8 +56,8 @@ impl ProcessBuilder { pub fn process(cmd: &str) -> ProcessBuilder { ProcessBuilder { program: cmd.to_owned(), - args: ~[], - path: ~[], + args: vec!(), + path: vec!(), cwd: os::getcwd() } } diff --git a/tests/support.rs b/tests/support.rs index ac5d6587d..78f983a62 100644 --- a/tests/support.rs +++ b/tests/support.rs @@ -48,7 +48,7 @@ impl FileBuilder { struct ProjectBuilder { name: ~str, root: Path, - files: ~[FileBuilder] + files: Vec } impl ProjectBuilder { @@ -56,7 +56,7 @@ impl ProjectBuilder { ProjectBuilder { name: name.to_owned(), root: root, - files: ~[] + files: vec!() } } -- 2.30.2